From: Richard M. Stallman <rms@gnu.org>
Date: Sat, 5 Jun 1993 17:31:54 +0000 (+0000)
Subject: (Fx_popup_menu): Error if we don't get a window or a frame somehow.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~95559
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=378f89399a2d4a2831e3274fe98ff97e6fbdf96c;p=emacs.git

(Fx_popup_menu): Error if we don't get a window or a frame somehow.
---

diff --git a/src/xmenu.c b/src/xmenu.c
index a5b69946b7a..1f70766426d 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -163,6 +163,10 @@ With this form of menu, the return value is VALUE from the chosen item.")
       XMenu_xpos = FONT_WIDTH (f->display.x->font) * XWINDOW (window)->left;
       XMenu_ypos = FONT_HEIGHT (f->display.x->font) * XWINDOW (window)->top;
     }
+  else
+    /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME,
+       but I don't want to make one now.  */
+    CHECK_WINDOW (window, 0);
 
   XMenu_xpos += FONT_WIDTH (f->display.x->font) * XINT (x);
   XMenu_ypos += FONT_HEIGHT (f->display.x->font) * XINT (y);